diff --git a/[refs] b/[refs] index 59069f2add0e..bf8033178279 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e55b20e81d5c40bd04f1747450ca622b105c97a3 +refs/heads/master: 1e23221e98deff9ef9adad5f2f991723f080b1ee diff --git a/trunk/arch/arm/mach-sa1100/Kconfig b/trunk/arch/arm/mach-sa1100/Kconfig index 4e5c07f4e456..854768fa9524 100644 --- a/trunk/arch/arm/mach-sa1100/Kconfig +++ b/trunk/arch/arm/mach-sa1100/Kconfig @@ -59,7 +59,6 @@ config SA1100_H3100 Linux port to this machine can be found at: - config SA1100_H3600 bool "Compaq iPAQ H3600/H3700" @@ -69,7 +68,6 @@ config SA1100_H3600 Linux port to this machine can be found at: - config SA1100_BADGE4 bool "HP Labs BadgePAD 4"